Reinstate the previous behavior for clicking Ok after activating a

2004-12-02  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): 	Reinstate the previous behavior for clicking Ok after
	activating a bookmark or path bar button in folder
	modes.  (#160044, Dennis Cranston)

diff --git a/ChangeLog b/ChangeLog
index a92d1c980034af7150f26673ababcec21571a625..26458ec94f814504a80cf8d040439566a80a22bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):        Reinstate the previous behavior for clicking Ok after
+       activating a bookmark or path bar button in folder 
+       modes.  (#160044, Dennis Cranston)
+
 2004-12-02  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a92d1c980034af7150f26673ababcec21571a625..26458ec94f814504a80cf8d040439566a80a22bc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):        Reinstate the previous behavior for clicking Ok after
+       activating a bookmark or path bar button in folder 
+       modes.  (#160044, Dennis Cranston)
+
 2004-12-02  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a92d1c980034af7150f26673ababcec21571a625..26458ec94f814504a80cf8d040439566a80a22bc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):        Reinstate the previous behavior for clicking Ok after
+       activating a bookmark or path bar button in folder 
+       modes.  (#160044, Dennis Cranston)
+
 2004-12-02  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a92d1c980034af7150f26673ababcec21571a625..26458ec94f814504a80cf8d040439566a80a22bc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):        Reinstate the previous behavior for clicking Ok after
+       activating a bookmark or path bar button in folder 
+       modes.  (#160044, Dennis Cranston)
+
 2004-12-02  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 7fb605e242875ee2246785f79d087fca2894b98e..489b9d46cc07a0cf21bf04ace2e835c3341093b2 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5119,11 +5119,16 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed)
 
       selection_check (impl, &num_selected, &all_files, &all_folders);
 
-      if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
-         || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+      if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
        {
-         if (num_selected > 0)
-           return TRUE;
+         if (num_selected != 1)         
+           return TRUE; /* zero means current folder; more than one means use the whole selection */    
+         else if (current_focus != impl->browse_files_tree_view)        
+           {
+             /* a single folder is selected and a button was clicked */
+             switch_to_selected_folder (impl);          
+             return TRUE;
+           }
        }
 
       if (num_selected == 0)